Merge from source.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 24 Sep 2011 15:33:21 +0000 (08:33 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 24 Sep 2011 15:33:21 +0000 (08:33 -0700)

Trivial merge